From d9e18f0a2f1e46ec6f0e207843007b265d0782a8 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Sat, 1 Sep 2001 20:56:41 +0000 Subject: [PATCH] add warnings per jrb's request. Sat Sep 1 21:57:27 2001 Kristian Rietveld * gtk/gtkrbtree.c (_gtk_rbtree_reorder): add warnings per jrb's request. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkrbtree.c | 7 +++++-- 8 files changed, 40 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e246ab818..7e74e2c7c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Sep 1 21:57:27 2001 Kristian Rietveld + + * gtk/gtkrbtree.c (_gtk_rbtree_reorder): add warnings + per jrb's request. + Fri Aug 31 20:01:23 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 3e246ab818..7e74e2c7c4 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Sat Sep 1 21:57:27 2001 Kristian Rietveld + + * gtk/gtkrbtree.c (_gtk_rbtree_reorder): add warnings + per jrb's request. + Fri Aug 31 20:01:23 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3e246ab818..7e74e2c7c4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sat Sep 1 21:57:27 2001 Kristian Rietveld + + * gtk/gtkrbtree.c (_gtk_rbtree_reorder): add warnings + per jrb's request. + Fri Aug 31 20:01:23 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3e246ab818..7e74e2c7c4 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sat Sep 1 21:57:27 2001 Kristian Rietveld + + * gtk/gtkrbtree.c (_gtk_rbtree_reorder): add warnings + per jrb's request. + Fri Aug 31 20:01:23 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3e246ab818..7e74e2c7c4 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sat Sep 1 21:57:27 2001 Kristian Rietveld + + * gtk/gtkrbtree.c (_gtk_rbtree_reorder): add warnings + per jrb's request. + Fri Aug 31 20:01:23 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3e246ab818..7e74e2c7c4 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sat Sep 1 21:57:27 2001 Kristian Rietveld + + * gtk/gtkrbtree.c (_gtk_rbtree_reorder): add warnings + per jrb's request. + Fri Aug 31 20:01:23 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3e246ab818..7e74e2c7c4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sat Sep 1 21:57:27 2001 Kristian Rietveld + + * gtk/gtkrbtree.c (_gtk_rbtree_reorder): add warnings + per jrb's request. + Fri Aug 31 20:01:23 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data. diff --git a/gtk/gtkrbtree.c b/gtk/gtkrbtree.c index 18cdf6e387..348b120bed 100644 --- a/gtk/gtkrbtree.c +++ b/gtk/gtkrbtree.c @@ -775,8 +775,11 @@ _gtk_rbtree_reorder (GtkRBTree *tree, GArray *array; GtkRBNode *node; gint i; - - + + g_return_if_fail (tree != NULL); + g_return_if_fail (length > 0); + g_return_if_fail (tree->root->count == length); + /* Sort the trees values in the new tree. */ array = g_array_sized_new (FALSE, FALSE, sizeof (GtkRBReorder), length); for (i = 0; i < length; i++) -- 2.30.2